Skip to content

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

c410-f3r and others added 15 commits January 12, 2023 08:41
…erbose, r=estebank

Render missing generics suggestion verbosely

It's a bit easier to read like this, especially ones that are appending new generics onto an existing list, like ": `, T`" which render somewhat poorly inline.

Also don't suggest `dyn` as a type parameter to add, even if technically that's valid in edition 2015.
[RFC 2397] Deny incorrect locations

cc rust-lang#51992

As declared in the RFC, `#[do_not_recommend]` should only be applicable on trait implementations.
…-confusing, r=lcnr

Rename `Ty::is_ty_infer` -> `Ty::is_ty_or_numeric_infer`

Makes sure people are aware that they may have a type variable *or* an int/float variable.

r? `@oli-obk` rust-lang#106322 (comment) but I could instead implement your solution, let me know.

(This will conflict with rust-lang#106322 for now, ignore that 😄)
…-blame, r=Nilstrieb

Ignore tests move in git blame

This commit is not relevant in the history, but may clobber the git blame output.
…ns, r=estebank

Make blame spans better for impl wfcheck

r? types
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 13, 2023
@JohnTitor
Copy link
Member Author

@bors r+ p=6 rollup=never

@bors
Copy link
Collaborator

bors commented Jan 13, 2023

📌 Commit c06d57e has been approved by JohnTitor

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 13, 2023
@bors
Copy link
Collaborator

bors commented Jan 13, 2023

⌛ Testing commit c06d57e with merge 5ca6f7d...

@bors
Copy link
Collaborator

bors commented Jan 13, 2023

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 5ca6f7d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2023
@bors bors merged commit 5ca6f7d into rust-lang:master Jan 13, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 13, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#106791 848221cb3e2ca0c02f9b42536b119ed5bc13f974
#106785 db4a29901262b105c93781d13b820dd4974d3359
#106782 9d74158a4226aca5d6af4b3d2d8ab562a3510212
#106754 af141e14e3116f67e1c7dd26d6c4627e44473f7d
#106716 4483804287a2c9c1890f2739f1b9c0f6ccc07e7d
#106608 99febdaef0a188bf79db4c5c4a4fcb3f8eb460b4

previous master: 4a04f252f9

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@JohnTitor JohnTitor deleted the rollup-xqkraw0 branch January 13, 2023 14:07
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5ca6f7d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.4% [-2.4%, -2.4%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.4% [-2.4%, -2.4%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 27, 2023
Rollup of 6 pull requests

Successful merges:

 - rust-lang#106608 (Render missing generics suggestion verbosely)
 - rust-lang#106716 ([RFC 2397] Deny incorrect locations)
 - rust-lang#106754 (Rename `Ty::is_ty_infer` -> `Ty::is_ty_or_numeric_infer`)
 - rust-lang#106782 (Ignore tests move in git blame)
 - rust-lang#106785 (Make blame spans better for impl wfcheck)
 - rust-lang#106791 (Fix ICE formatting)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants